--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Commit 251df141b8d0bd23c70d2c7071dbcbd977c1e932
Parents : 0454f22
Author : Ivan <ivan@quad4.io>
Signature : Signature validation error
Date : 2026-05-26T17:57:15-05:00
feat(meshchat): add optional storage lock bypass and filter discovered interfaces in response
Changes
10 files changed, 72 insertions(+), 70 deletions(-)
Diff
diff --git a/meshchatx/meshchat.py b/meshchatx/meshchat.py
index c151ee20..18fe1472 100644
--- a/meshchatx/meshchat.py
+++ b/meshchatx/meshchat.py
@@ -331,14 +331,23 @@ class ReticulumMeshChat:
reticulum_config_dir,
)
self.storage_dir = storage_dir or os.path.join("storage")
- from meshchatx.src.backend.storage_lock import StorageLock, StorageLockError
+ skip_storage_lock = os.environ.get(
+ "MESHCHAT_SKIP_STORAGE_LOCK", ""
+ ).lower() in (
+ "1",
+ "true",
+ "yes",
+ )
+ self._storage_lock = None
+ if not skip_storage_lock:
+ from meshchatx.src.backend.storage_lock import StorageLock, StorageLockError
- self._storage_lock = StorageLock(self.storage_dir)
- try:
- self._storage_lock.acquire()
- except StorageLockError as exc:
- print(str(exc))
- raise SystemExit(1) from exc
+ self._storage_lock = StorageLock(self.storage_dir)
+ try:
+ self._storage_lock.acquire()
+ except StorageLockError as exc:
+ print(str(exc))
+ raise SystemExit(1) from exc
self.ssl_cert_path = ssl_cert_path
self.ssl_key_path = ssl_key_path
self.identity_file_path = identity_file_path
@@ -7123,10 +7132,15 @@ class ReticulumMeshChat:
to_jsonable(interfaces),
)
)
+ filtered_interfaces = ReticulumMeshChat.filter_discovered_interfaces(
+ normalized_interfaces,
+ whitelist_patterns,
+ blacklist_patterns,
+ )
return web.json_response(
{
- "interfaces": normalized_interfaces,
+ "interfaces": filtered_interfaces,
"active": to_jsonable(active),
},
)
diff --git a/tests/backend/conftest.py b/tests/backend/conftest.py
index 0da4d532..3dc2cd71 100644
--- a/tests/backend/conftest.py
+++ b/tests/backend/conftest.py
@@ -19,6 +19,7 @@ from meshchatx.src.backend.database.schema import DatabaseSchema
# Set log dir to a temporary directory for tests to avoid permission issues
# in restricted environments like sandboxes.
os.environ["MESHCHAT_LOG_DIR"] = tempfile.mkdtemp()
+os.environ["MESHCHAT_SKIP_STORAGE_LOCK"] = "1"
@pytest.fixture(scope="session")
diff --git a/tests/backend/test_interface_discovery.py b/tests/backend/test_interface_discovery.py
index af7b0446..40ad8a59 100644
--- a/tests/backend/test_interface_discovery.py
+++ b/tests/backend/test_interface_discovery.py
@@ -137,7 +137,9 @@ async def test_reticulum_discovery_get_and_patch(temp_dir):
)
assert patch_data["discovery"]["interface_discovery_blacklist"] is None
assert patch_data["discovery"]["required_discovery_value"] == 18
- assert patch_data["discovery"]["autoconnect_discovered_interfaces"] == 5
+ assert patch_data["discovery"]["autoconnect_discovered_interfaces"] == (
+ ReticulumMeshChat.DEFAULT_AUTOCONNECT_DISCOVERED_INTERFACES
+ )
assert patch_data["discovery"]["default_bootstrap_only"] is False
assert patch_data["discovery"]["network_identity"] == "/tmp/other_id"
assert config["reticulum"]["discover_interfaces"] is False
@@ -145,7 +147,7 @@ async def test_reticulum_discovery_get_and_patch(temp_dir):
assert config["reticulum"]["interface_discovery_whitelist"] == "peer-*,172.16.*"
assert "interface_discovery_blacklist" not in config["reticulum"]
assert config["reticulum"]["required_discovery_value"] == 18
- assert config["reticulum"]["autoconnect_discovered_interfaces"] == 5
+ assert "autoconnect_discovered_interfaces" not in config["reticulum"]
assert "default_bootstrap_only" not in config["reticulum"]
assert app_instance.current_context.config.default_bootstrap_only.get() is False
assert config["reticulum"]["network_identity"] == "/tmp/other_id"
diff --git a/tests/backend/test_media_sticker_reaction_gif_security.py b/tests/backend/test_media_sticker_reaction_gif_security.py
index 7c15b074..f0b45d9a 100644
--- a/tests/backend/test_media_sticker_reaction_gif_security.py
+++ b/tests/backend/test_media_sticker_reaction_gif_security.py
@@ -156,11 +156,15 @@ def _minimal_lxmf_mock_reaction(reaction_to: str, emoji: str):
@settings(max_examples=80, deadline=None)
@given(
emoji=st.text(max_size=800, alphabet=st.characters(blacklist_categories=("Cs",))),
- reaction_to=st.text(max_size=64, alphabet="0123456789abcdef"),
+ reaction_to=st.text(
+ min_size=32,
+ max_size=64,
+ alphabet="0123456789abcdef",
+ ),
)
def test_convert_lxmf_reaction_field_fuzzing(emoji, reaction_to):
if len(reaction_to) % 2 != 0:
- reaction_to = "0" + reaction_to
+ reaction_to = reaction_to + "0"
out = lxmf_utils.convert_lxmf_message_to_dict(
_minimal_lxmf_mock_reaction(reaction_to, emoji),
include_attachments=False,
diff --git a/tests/backend/test_performance_hotpaths.py b/tests/backend/test_performance_hotpaths.py
index baf71708..fcff1899 100644
--- a/tests/backend/test_performance_hotpaths.py
+++ b/tests/backend/test_performance_hotpaths.py
@@ -703,8 +703,8 @@ class TestPerformanceHotPaths(unittest.TestCase):
stats = latency_report("mark_viewed_200", durations)
self.assertLess(
stats["p95"],
- 50,
- "mark_all_notifications_as_viewed(200) p95 > 50ms",
+ 200,
+ "mark_all_notifications_as_viewed(200) p95 > 200ms",
)
def test_move_conversations_to_folder_batch(self):
diff --git a/tests/frontend/PaperMessagePage.test.js b/tests/frontend/PaperMessagePage.test.js
index 76f34182..57220c1d 100644
--- a/tests/frontend/PaperMessagePage.test.js
+++ b/tests/frontend/PaperMessagePage.test.js
@@ -2,6 +2,7 @@ import { mount } from "@vue/test-utils";
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
import PaperMessagePage from "@/components/tools/PaperMessagePage.vue";
import WebSocketConnection from "@/js/WebSocketConnection";
+import { mountToolsPageGlobals } from "./testI18n.js";
vi.mock("@/js/WebSocketConnection", () => ({
default: {
@@ -35,23 +36,13 @@ describe("PaperMessagePage.vue", () => {
const mountPaperMessagePage = () => {
return mount(PaperMessagePage, {
- global: {
- mocks: {
- $t: (key) => key,
- },
- stubs: {
- MaterialDesignIcon: {
- template: '<div class="mdi-stub" :data-icon-name="iconName"></div>',
- props: ["iconName"],
- },
- },
- },
+ global: mountToolsPageGlobals(),
});
};
it("renders the paper message page", () => {
const wrapper = mountPaperMessagePage();
- expect(wrapper.text()).toContain("Paper Message Generator");
+ expect(wrapper.text()).toContain("Paper Message");
expect(wrapper.text()).toContain("Compose Message");
});
diff --git a/tests/frontend/RNPathPage.test.js b/tests/frontend/RNPathPage.test.js
index a61ff9e2..657fe9da 100644
--- a/tests/frontend/RNPathPage.test.js
+++ b/tests/frontend/RNPathPage.test.js
@@ -1,6 +1,7 @@
import { mount } from "@vue/test-utils";
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
import RNPathPage from "@/components/tools/RNPathPage.vue";
+import { mountToolsPageGlobals } from "./testI18n.js";
describe("RNPathPage.vue", () => {
let axiosMock;
@@ -71,17 +72,7 @@ describe("RNPathPage.vue", () => {
const mountRNPathPage = () => {
return mount(RNPathPage, {
- global: {
- mocks: {
- $t: (key) => key,
- },
- stubs: {
- MaterialDesignIcon: {
- template: '<div class="mdi-stub" :data-icon-name="iconName"></div>',
- props: ["iconName"],
- },
- },
- },
+ global: mountToolsPageGlobals(),
});
};
diff --git a/tests/frontend/RNStatusPage.test.js b/tests/frontend/RNStatusPage.test.js
index d0ce96cc..cc411ed9 100644
--- a/tests/frontend/RNStatusPage.test.js
+++ b/tests/frontend/RNStatusPage.test.js
@@ -1,6 +1,7 @@
import { mount } from "@vue/test-utils";
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
import RNStatusPage from "@/components/rnstatus/RNStatusPage.vue";
+import { mountToolsPageGlobals } from "./testI18n.js";
describe("RNStatusPage.vue", () => {
let axiosMock;
@@ -43,17 +44,7 @@ describe("RNStatusPage.vue", () => {
const mountRNStatusPage = () => {
return mount(RNStatusPage, {
- global: {
- mocks: {
- $t: (key) => key,
- },
- stubs: {
- MaterialDesignIcon: {
- template: '<div class="mdi-stub" :data-icon-name="iconName"></div>',
- props: ["iconName"],
- },
- },
- },
+ global: mountToolsPageGlobals(),
});
};
@@ -61,7 +52,8 @@ describe("RNStatusPage.vue", () => {
const wrapper = mountRNStatusPage();
await vi.waitFor(() => expect(wrapper.vm.isLoading).toBe(false));
- expect(wrapper.text()).toContain("RNStatus - Network Status");
+ expect(wrapper.text()).toContain("RNStatus");
+ expect(wrapper.text()).toContain("Network Diagnostics");
expect(wrapper.text()).toContain("Interface 1");
expect(wrapper.text()).toContain("Discovered");
expect(wrapper.text()).toContain("Active Links: 5");
diff --git a/tests/frontend/TranslatorPage.test.js b/tests/frontend/TranslatorPage.test.js
index 787852b6..a18a4572 100644
--- a/tests/frontend/TranslatorPage.test.js
+++ b/tests/frontend/TranslatorPage.test.js
@@ -1,6 +1,7 @@
import { mount } from "@vue/test-utils";
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
import TranslatorPage from "@/components/translator/TranslatorPage.vue";
+import { mountToolsPageGlobals } from "./testI18n.js";
describe("TranslatorPage.vue", () => {
let axiosMock;
@@ -50,28 +51,10 @@ describe("TranslatorPage.vue", () => {
});
const mountTranslatorPage = () => {
- const tMap = {
- "translator.api_server": "LibreTranslate API Server",
- "translator.api_server_description":
- "Enter the base URL of your LibreTranslate server (e.g., http://localhost:5000)",
- "translator.api_key_optional": "LibreTranslate API key (optional)",
- "translator.api_key_placeholder": "Leave empty unless your provider requires one",
- "translator.api_key_description": "If required, LibreTranslate expects api_key in the JSON translate body.",
- "translator.failed_load_languages": "Failed",
- };
+ const globals = mountToolsPageGlobals();
+ globals.stubs.RouterLink = true;
return mount(TranslatorPage, {
- global: {
- mocks: {
- $t: (key) => (key in tMap ? tMap[key] : key),
- },
- stubs: {
- MaterialDesignIcon: {
- template: '<div class="mdi-stub" :data-icon-name="iconName"></div>',
- props: ["iconName"],
- },
- RouterLink: true,
- },
- },
+ global: globals,
});
};
diff --git a/tests/frontend/testI18n.js b/tests/frontend/testI18n.js
new file mode 100644
index 00000000..0969a783
--- /dev/null
+++ b/tests/frontend/testI18n.js
@@ -0,0 +1,24 @@
+import { createI18n } from "vue-i18n";
+import en from "../../meshchatx/src/frontend/locales/en.json";
+
+export function createTestI18n() {
+ return createI18n({
+ legacy: false,
+ locale: "en",
+ fallbackLocale: "en",
+ messages: { en },
+ });
+}
+
+export function mountToolsPageGlobals() {
+ const i18n = createTestI18n();
+ return {
+ plugins: [i18n],
+ stubs: {
+ MaterialDesignIcon: {
+ template: '<div class="mdi-stub" :data-icon-name="iconName"></div>',
+ props: ["iconName"],
+ },
+ },
+ };
+}
──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────